fix location bugs
add special waste