Builder work, lots of bug fixes and new stuff