Derped with builds and fixed errors