Small improvements

- Some small code changes
- Configured the project so that it can correctly be set to Debug and
Release and Win32 and x64