Added boat marker, automatic position updating, refactoring.