Add comments, fix array