Fixes and spring cleaning