Bugfixes, torches now counted & added, correct amount consumed & counted et. al