fixes, enhancements

I may release this or add g+ sharing (with pic) to it