More iPad implementation and bug fixes