Some styles added, some functions reorganized, some new things added