test project + bug fixes