Charlie - worked on various issues and modifications