new line/marker types, several bugs fixed