FIrst commit
fixed some issues