Fixed some minor bugs, errors and crashing.