bunch of improvements, equipements module added