Bug fixes + general improvements #84

Closed ghost closed 10 years ago