Fixes and development