updates and fixes

Some more fixes, adresses issue no 8