bug fixes, basic flag support, ...