bug fixes style changes and more