Renamed and cleaned a lot, found a bug and taking a break