tweaks
added more sources, refactored sources code