minor changes
main tasks are completed!