feature: server added & error management improved