More tweaks. Sending to travis for testing.