fixed things, changed to build properly