Several fix
Added ionic stuff