ok. final working, ready for stable release (hopefully)