various fixes + css work