Fixing weekend bugs.
Monday morning merge. I like the smell of napalm in the morning ^^...