added tags support, fixed indentation all over