Fixed some stuff and added support form some other stuff