added content and minor bug fixes