added keywords, improved auto-indent