cleanup and small fixes
forgot build