version support + several bug fixes