Fixed up couple things and did some testing