Last commit was made in haste and had some dumb mistakes fix for those.