fixed more bugs
...