Added new files and fixed some random stuff