Updated text
Fixed small bugs