tightening it all up
v0.4.7