Added drawing tools and corrected markes array.