added some more things, need to fix array issue