Added fixes to several bugs.