more copypastas, misc fixes