Wrapped up some changes