Removed reading from xml (was not working on Android)
Fixed bugs