basic updates

some bugs removed