Renamed variables
Added tile entity stuff (I think I did it wrong though)