updates from rezn8d merge