new base, fixes

closes #10