fixed some warnings/errors