Added input validation

Added garage and cabanon toggle
Some code restructuring