Added more markers and other features