removed some debugs and TODOs
fixed mainactivity sync issue