some TODO fixed, made embed modal