few more features
merged, some tiny things added, bug fix