I'll fix these when (if ever) the project restarts, pratice makes perfect =)