Fixing stuff and added new things!