added increments where necessary, minor clean up