Milestone 24

fixing some issues