Crasch fix and some comments