Finished additional testing. Lot's of small tweaks.