updated branch
some compile updates