Local dev

A couple changes that I think will make local development easier.