Bug fixes mostly, version 0.4