Added the C++11 flag to cmake
Added more constructors, corrected a few things, moved some declarations around