Some minor changes, about to recontinue work again