tweaks to pragma
fixed small parts to autonomous