fixes, more to come