Minor tweaks

Changes on input, edited array structure