some fixes, #41