Cleaned a bit
Various fixes