fixed stuff for andrew