cleaned up compile, fixed branch bug