Update fixes and features

Enable simple comment out lines
Fix in key value parsing