added 32bit to 32bit support + more