Hot fixes

removed "#" references for Danny's sanity