prelast commiit

just a few changes