some upd and fix exceptions=)