continue implementation and bugfixing