fixed errors with && and #