Add some comments fix returns
fix stuff