added stuff that I've lost when testing branches
changes from Vivianan commited to my local I think