Error Handling. Optimisations. Bug Fixes