Removed printlns
Added functionality for not repeating location slot fills across different location types, and made the location slot identifying code more conservative