Added trash box feature and fixed bugs