cleaned up a bit and added tr's for type form