new features bug cleanup