Applied Sheena's updates / fixed bugs