CleanUp

CleanUp plus additions aswell again Hopefully for the last time in
alpha... :O