fixed a compilation issue; added some more stuff