Fixing some stuff and things!