bug fixes + added features