Fix some minor design issues, but time is running out to finish it. Will continue after cowboy.