some minor fixes again, should be the last one to get it all working smooth