Added new switchable FPs, minor updates to rendering