added / fixed some stuff