Completed TODOs and fixed a bug

Title. Also, are there any other issues that I've overlooked?