added more improvements

I will change this to meaningful error messages!