Bug fixes and Organisation