Fixed many bugs, got several tests to pass on travis, but not all.