fixed paths and cleaned up source