More paramaterization, cleanups