Update 1

Fixed many issues.