more patterns and some fixes
version number 0.4