Little updates and -g3 flag for cmake build