Logo, various bug fixes etc.