Line 144 Bug Fix

And other miscellaneous changes