Fixes most issues/ Adds new functionality