Bugfixes & solved todos