Changed functions file to include Forms by default.
A few small changes.