bug fixes
until last item working