cleaned up some mistakes...still testing