Fix Location Bug

* Fix location bugs
* Add special waste