small fixes, close up #137