more updates, including removing cruft from base mojo