arranged project and removed some warnings