first commit
fixed some issues