Some minor cleanup & additional bug notes