compile error free
minor additions and compile fixes