accumulative bug fixes & updated build system