Minor Bug Fixes

Several bugs have been fixed and the performance should more closely
resemble the last stable app version.