Complex ver. crash bug fix, simple ver. fixes