Fixed bonehead issues, Attempt #2