Bugfixes
Order email, finishing up