fix a bug when stepping bomb on site... and refactored site classes