Config added + Bugifxes