fixes
cleaned up