changes from textmate