worked on issues follwing first testing and migration script
updated android setup