Fixed stuff with arrays and stuff