Fixed the forum, cleaned code