Miscellaneous changes after initial test