Implemented suggestions and fixed issues