Bug fixes & iterating on build system