Add periods
Some fixes for validation