More changes after bug fixes... interesting changes though