Improve arrays, fixes, updates