Cleaned up + made some fixes