General bug fixing + Content