To-Do listΒΆ

Fix know problems