Several updates; custom_ps1, new lines at EOF