Fixed some ArrayIndexException issues
Added new package / classes