Updated Initial files again

Fly fixed, made code a bit cleaner, and messier at the same time!