Enhancement #11, Bug #14, and Bug #11 fixed