Old main removed, small fixes