cleanup and fixes
updated things