Commit recent changes; fix setup errors