few more fatal errors were fixed