Completed

New features and bugfixing part 3