Multiple bug fixes - 0.2.1