Some bug fixes and tweaks + soul glass panes