Update, code cleanup, apple maps