Various clean-ups
Added web code file wildcards
Clean-ups and error fixes