fix another bunch of warnings
indentation update
don't use own message handler on android