fixed many derps that were preventing build from working properly