Bug fixing and making it xcode4 compatible.
Bug Fixing.