fixed toolbar section and various bugs. removed unused code yet again..