Enh/tweaks

resolves #5 , closes #5