resolving bugs per john morgan