ocra!
fixed some issues