fixed macro idents and java regex fix