Develop - style and bug fixes