bug/logic fixing, general testing