last few changes, hopefully