Bug fixes and project organization