fixing stuff, more logging