Added check for location
Corrected wrong sprite variables in original
Added notices