Some style changes, add more to info function.