Routine commit: there are still a lot of bugs that need to be
straightened out