#43 - Formatting, fix some obvious bugs