minor changes, still reviewing before final project