Some bugfixes being made, interrupted by rfp