some upd and fix js exceptions. again :D