fixed annoying tabs
fixed some issues