Added quit feature and some android improvments