bugfixing and added properties