Fixed a lot of shit (Dragos)