bump updated
various re-writes