Fixed constructors and small fixes in classes