fixed compile warnings/errors on WIP code