move code around a bit
update to latest external packages