Updated to fix bugs from initial launch