Fixed bug with remaining and lift methods. Cleaned up comments