buildable and some warnings resolved