Some Style changes / bug fixes / new stuff