Various bug fixes
new logo