Few more tweaks. Squished some bugs, turned a crash into a non-crashing Array Range Exception.