various changes to make it actually usable