fixes from dev