Fixed various issues
Updated content