- Tidied up code and improved consistency
- Enabled other handlers now the memory problems have been solved