Several changes and todos added