Fourth Commit

More final touches.