misc updates

see comments of each commit