no more tabs; todo functions; cleanup