Made a few tweaks and added some to-dos