Made pop/remove correct; fixed bugs
Created test shell; deleted old main