various bugfixes.

Router V0.5 and Android App V0.5 ready for testing deployment
Relevant: #12, #6, #4