some fixes

'#' fix