interface changes put markers back in, some code cleanup