okay made some changes. Still #47.3 and #49 needs to be addressed.