stripped out vectors, added some useful 'round/floor/ceil to nearest multiple of' functions
merged