several fixes + better look