Fixed watch relative path. Made sure all functions use block statements.