Implemented various changes as requested by Noosa mentors group