Fixed remaining and lift methods. Cleaned up comments