Fixed issues plaguing yesterdays work. Added a few...hacks"