Version 1.3 - Modifications based on feedback received on LightHouse

Resolved Tickets - #216, #260 and #261