bunch of improvements + cleanup usings