Bug Fixes Prior to Work on Better CSS Support