updated core, improved user interface