Bug fixes and clearing out broken features