Added pop and fixed stuff