Fixes and Features!