Tidied up and fixed android project