Fix additional bugs that appear with data entry. Clean up formatting.