changed some arraylists to come collections
i hate everything