added pick up stuff and fixed reset