[source] main added, general fixes