Fixed a number of small issues including going out of bounds in the live session and whatnot