Re post update

Just basic repost of the edits and cleanup of unused code

ps: check your lang resource files :P