clean up symbolic manipulations across the board, add magic