style + some fixes