Bug fixes + added todo