More Fixes and Features