issues

Fixed bugs