Fix bug + implement -b switch to perform builds