Update; some preliminary utilities added