cleanup, fix warnings