Working Well

More bug fixes to come...