Tweaking and additions

More to come soon.