moving to new lib project, fixed stuff also