remove imports
param tweaks
Allow p,q in constructor
Rename class