added support for #callback, made some small hlint fixes