fix paul stuff a bit