updated some stuff and added excepting handler|