more todo updates, PAAV works