* Various CS fix and better exception handling