add some functions and change a few styles

new branch