Added glishen, other minor touches