Updates, cleanup and bug fixes before first customer review