Small improvements and fixes, more info in readme