minor changes, now building