fixed bugs. ported and added android project