various changes I forgot to commit last time