Completed several modifications and few features addition.