Save from Lab Computer.

Some bug fixes/coemetic changes