solving some minor stuff