last fixes, closes #31