5 fine tune

Resolving issues #4 and #5.