Lots of bug fixes. Get default values working.