Added size, fixed ArrayList<>, other bugs