* fix some stuff