Fix read the docs & improve use of enum types

Fix read the docs & improve use of enum types #514