Fixes + additions + swap pc's