Fixed Minor Bug Issues