more fixes to base style and functionality