Dev Test Alpha 5-1-7

Up-to-date stuff, NRE's and Key out of index exceptions.. wooh