Not sure what's changed, but pretty sure it's useful
Fixed bugs, prepared code for first build