0143: Speed up saving; little bug fix