Bugfix && Better C