Fixed a few things more