Updated a lot of small things, new triggers for future reminder and some cleanup.