Cleaned up commenting forms
Fixed rules creation in scripts
Updated phone module
Complete update for phone module