extra fixes. seems to be ready