Resolved several problems